Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(contracts): merge release 23 into dev #508

Merged
merged 43 commits into from
Jun 5, 2024
Merged

chore(contracts): merge release 23 into dev #508

merged 43 commits into from
Jun 5, 2024

Conversation

koloz193
Copy link
Contributor

@koloz193 koloz193 commented Jun 5, 2024

What ❔

Why ❔

Checklist

  • PR title corresponds to the body of PR (we generate changelog entries from PRs).
  • Tests for the changes have been added / updated.
  • Documentation comments have been added / updated.

popzxc and others added 30 commits March 22, 2024 10:59
@popzxc
chore: Compile yul files in parallel within a single folder (#271)
a27c778
@onyxet
ci: Make build release manual triggered only (#287)
4aa7006
@StanislavBreadless
Script + safeTransferFromLegacy (#402)
fcee799
@kelemeno
fix: get all hyperchains (#403)
381911e
@koloz193
chore(executor): remove constraint on pubdata hash for validiums (#404)
670434d
@StanislavBreadless
Update L1SharedBridge.sol (#405)
8099425
@koloz193
chore(scripts): update setValidium to setPubdataPricing (#406)
78d339f
@StanislavBreadless
Accept ownership script (#409)
f78faf0
@StanislavBreadless @kelemeno @koloz193
Script to cross check the contracts from the upgrade (#408)
f9ccb10 
Co-authored-by: kelemeno <kl@matterlabs.dev>
Co-authored-by: kelemeno <34402761+kelemeno@users.noreply.github.com>
Co-authored-by: koloz193 <zach.kolodny@gmail.com>
@kelemeno
fix: upgrade hyperchain add missing fields (#415)
b824726
@StanislavBreadless
Extend bootloader memory (#421)
b5314f6
@aon @Deniallugo
feat: improve foundry l1 config deployment (#378)
d89e406 
Co-authored-by: Danil <deniallugo@gmail.com>
@kelemeno
Kl/l2 bridge fix l1 bridge names (#434)
d8e07b6
@Deniallugo @aon
remove redundant configs (#429)
51c3b47 
Signed-off-by: Danil <deniallugo@gmail.com>
Co-authored-by: aon <21188659+aon@users.noreply.github.com>
@benceharomi @StanislavBreadless @kelemeno
fix: correct local bridge testing (#440)
3e59239 
Co-authored-by: Stanislav Breadless <stanislavbezkor@gmail.com>
Co-authored-by: kelemeno <34402761+kelemeno@users.noreply.github.com>
@StanislavBreadless @vladbochok
Move gas bound caller to a separate folder (#425)
13445ad 
Co-authored-by: Vlad Bochok <41153528+vladbochok@users.noreply.github.com>
@vladbochok
Merge branch 'main' into release-v23
61d81d3
@vladbochok
Attempt to fix CI
f9e9d3c
@kelemeno @StanislavBreadless
fix: hyperchain upgrade fix2 (don't merge) (#401)
accecc4 
Co-authored-by: Stanislav Bezkorovainyi <stanislavbezkor@gmail.com>
@koloz193
remove log values when validium (#465)
fa85062
@EmilLuta
Updates Verifier.sol for 1.5.0 patch
46c9170
@koloz193
update vk
3a0dd43
@EmilLuta
Merge pull request #466 from matter-labs/evl-update-verifier-sol-for-…
452a54f 
…1-5-0-patch

Update Verifier.sol for 1.5.0 patch
@ischasny
fix: allow to skip initialization of chain governance
d57c659
@ischasny
Merge pull request #468 from matter-labs/ivan/skip-initialize-governance
bffbf0a
@Deniallugo
Deploy l2 contracts and use governance for upgrades (#441)
707043f 
Signed-off-by: Danil <deniallugo@gmail.com>
@kelemeno
update verification keys (#472)
d334f82
@koloz193
Update Verifier from new vk (#474)
900c5c9
@Deniallugo
fix init bridges (#469)
c64d448 
Signed-off-by: Danil <deniallugo@gmail.com>
@ischasny @kelemeno
feat: register hyperchain through governance EVM-597 (#443)
12a7d3b 
Co-authored-by: kelemeno <kl@matterlabs.dev>
aon and others added 9 commits May 21, 2024 19:48
@aon
feat: update foundry scripts with new config (#485)
41fb9d9
@aon
fix: utils library getting deployed (#487)
5312fd4
@StanislavBreadless @perekopskiy @vladbochok
Packed protocol version (#492)
8cc766e 
Co-authored-by: perekopskiy <mikeson.dp@gmail.com>
Co-authored-by: Vlad Bochok <41153528+vladbochok@users.noreply.github.com>
Co-authored-by: perekopskiy <53865202+perekopskiy@users.noreply.github.com>
@StanislavBreadless
Use governance as hyperchain governor upon init (#501)
32ca4e6
@Artemka374
feat: update verifier (#503)
16ae765
@StanislavBreadless
Change how we update chain creation params (#502)
fe0b7f4
@matias-gonz @Deniallugo @aon
chore: Move l1-contracts-foundry (#504)
8a70bbb 
Co-authored-by: Danil <deniallugo@gmail.com>
Co-authored-by: Agustin Aon <21188659+aon@users.noreply.github.com>
@koloz193
Merge branch 'release-v23' into dev
8e4c291
@koloz193
tests and fix merge conflict
d97d8cd
@StanislavBreadless StanislavBreadless merged commit 360a918 into dev Jun 5, 2024
21 checks passed
@StanislavBreadless StanislavBreadless deleted the zk-merge-release-23-dev branch June 5, 2024 20:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@StanislavBreadless StanislavBreadless StanislavBreadless approved these changes

@vladbochok vladbochok Awaiting requested review from vladbochok vladbochok is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.